From: Anton Gladky <gladk@debian.org>
Date: Sun, 19 Jun 2022 14:24:38 +0000 (+0200)
Subject: Fix FTBFS against NETCDF>4.9.0. (Closes: #1012703)
X-Git-Tag: archive/raspbian/9.5.2+dfsg4-3+rpi1^2~120
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css//%22node%24level1.html/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22node%24level1.html/%22?a=commitdiff_plain;h=b05b21f;p=vtk9.git

Fix FTBFS against NETCDF>4.9.0. (Closes: #1012703)
---

diff --git a/debian/control b/debian/control
index 0141e055d..5d7b4d367 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Build-Depends: chrpath,
                liblz4-dev,
                libmrmpi-dev,
                libnetcdf-cxx-legacy-dev,
-               libnetcdf-dev,
+               libnetcdf-dev (>= 1:4.9.0),
                libogg-dev,
                libosmesa6-dev,
                libpng-dev,
diff --git a/debian/patches/110_vtk9_netcdf.patch b/debian/patches/110_vtk9_netcdf.patch
new file mode 100644
index 000000000..888225e2b
--- /dev/null
+++ b/debian/patches/110_vtk9_netcdf.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with new netcdf
+Author: Anton Gladky <gladk@debian.org>
+Bug-Debian: https://bugs.debian.org/1012703
+Last-Update: 2022-06-19
+
+--- vtk9-9.1.0+really9.1.0+dfsg2.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
++++ vtk9-9.1.0+really9.1.0+dfsg2/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
+@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in
+         */
+ 
+         /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
+-        const int NC_SZIP_NN = 32;      /* Selects nearest neighbor coding method for szip. */
++        // const int NC_SZIP_NN = 32;      /* Selects nearest neighbor coding method for szip. */
+         /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
+         const int SZIP_PIXELS_PER_BLOCK =
+             file->compression_level == 0 ? 32 : file->compression_level;
diff --git a/debian/patches/series b/debian/patches/series
index 11535dec5..ee1cfee67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 97_reproducible_builds.patch
 98_fix_mpi4py.py
 99_fix_ftbfs.patch
+110_vtk9_netcdf.patch